Merge branch 'MDL-50357_master' of git://github.com/markn86/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 30 Dec 2015 09:19:17 +0000 (09:19 +0000)
committerDan Poltawski <dan@moodle.com>
Wed, 30 Dec 2015 09:19:17 +0000 (09:19 +0000)

Trivial merge