Merge remote-tracking branch 'origin/master' into build-ng

Conflicts: hydra-module.nix

Created by  Eelco Dolstra  on August 4, 2015
OWYI2MHFVMGY3OWDO65EL7CJCHYGOGDM2W4Q5PSFGEYSWPYGCECAC
Change contents