Merge branch 'MDL-62017-master' of https://github.com/lucaboesch/moodle