Merge branch 'MDL-53044' of https://github.com/ak4t0sh/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 19 Dec 2016 08:47:21 +0000 (08:47 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 19 Dec 2016 08:47:21 +0000 (08:47 +0000)

Trivial merge