Merge branch 'MDL-54838-master' of https://github.com/nashtechdev01/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 23 Aug 2016 04:42:52 +0000 (12:42 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 23 Aug 2016 04:42:52 +0000 (12:42 +0800)

Trivial merge