Merge pull request #2041 from mfournier/contrib-docker