Merge branch 'MDL-32596_master' of https://github.com/rezaies/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 13 Apr 2017 14:58:00 +0000 (15:58 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 13 Apr 2017 14:58:00 +0000 (15:58 +0100)

Trivial merge