Merge remote-tracking branch 'apache/master' into config-cleanup

Conflicts:
	docs/configuration.md