propagating changes to haskellExtraProfessional from commit 9a41e2d395afc2d5128799503264e5ebc554d1fb
Merge branch 'master' into propagate_haskellExtraProfessional_9a41e2d395afc2d5128799503264e5ebc554d1fb