Merge origin/master into mdv-gpl3-py26