Added perl-CPAN to deps
Merge remote-tracking branch 'origin/master' into bmo

Conflicts:
	Dockerfile
Merge remote-tracking branch 'origin/bmo' into dkl
More personal changes