Merge branch 'MDL-57112-master' of git://github.com/cameron1729/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 23 Nov 2016 10:34:33 +0000 (10:34 +0000)
committerDan Poltawski <dan@moodle.com>
Wed, 23 Nov 2016 10:34:33 +0000 (10:34 +0000)

Trivial merge