build

Merge pull request #2046 from peternewman/0.11-plugfest-fixes #650

Job	Run time
distcheck-debian-stable-amd64-gcc	18m 30s
distcheck-debian-stable-amd64-clang	2m 41s
coverage-debian-stable-amd64-gcc	19m 53s
Verify trees for distcheck-debian-stable-amd64-gcc	22s
Verify trees for distcheck-debian-stable-amd64-clang	16s
	41m 42s

Provide feedback