propagating changes to haskellExtraProfessional from commit 61ec519f6b46457f6cd6884fe0dab6937f9348cd
Merge branch 'master' into propagate_haskellExtraProfessional_61ec519f6b46457f6cd6884fe0dab6937f9348cd