Debian 7.2 no longer available
Merge branch 'master' into ArbitraryConfigHash