Merge remote-tracking branch 'devel/bug396_prettyfylabels_release'
Merge remote-tracking branch 'devel/esmf_ubuntu_ok_release'
Merge remote-tracking branch 'devel/lxml_no_esgf_release'