Merge branches 'MDL-53988-master-fix3' and 'MDL-53988-master-fix3' of https://github...
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 20 May 2016 04:23:36 +0000 (12:23 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 20 May 2016 04:23:36 +0000 (12:23 +0800)

Trivial merge