Merge branch 'w07_MDL-26211_20_https' of git://github.com/skodak/moodle