Merge branch 'MDL-53978-render-callbacks' of https://github.com/brendanheywood/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 27 Feb 2017 07:20:28 +0000 (15:20 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 27 Feb 2017 07:20:28 +0000 (15:20 +0800)

Trivial merge