Merge branch 'MDL-57004-master' of git://github.com/ankitagarwal/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 17 Nov 2016 23:27:15 +0000 (07:27 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 17 Nov 2016 23:27:15 +0000 (07:27 +0800)

Trivial merge