Merge branch 'MDL-57914-master' of git://github.com/jleyva/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 8 Mar 2017 07:59:25 +0000 (15:59 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 10 Mar 2017 18:04:45 +0000 (18:04 +0000)

Trivial merge