Merge branch 'MDL-57643-master' of git://github.com/jleyva/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 15 Mar 2017 23:58:08 +0000 (07:58 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 15 Mar 2017 23:58:08 +0000 (07:58 +0800)

Trivial merge