Merge branch '20161007185649_new_pr_Cantera221' of github.com:boegel/easybuild-easyconfigs into 20161007185649_new_pr_Cantera221