Merge branch 'MDL-56417_master' of https://github.com/dmonllao/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 11 Nov 2016 03:53:41 +0000 (11:53 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 11 Nov 2016 03:53:41 +0000 (11:53 +0800)

Trivial merge