Merge branch 'MDL-57207-master' of git://github.com/cameron1729/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 30 Nov 2016 09:51:21 +0000 (09:51 +0000)
committerDan Poltawski <dan@moodle.com>
Wed, 30 Nov 2016 09:51:21 +0000 (09:51 +0000)

Trivial merge