Merge branch 'dev-python/derpconf'