Merge branch 'MDL-60319-master-google-converter-bug' of https://github.com/mspall...
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 19 Oct 2017 03:27:42 +0000 (11:27 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 19 Oct 2017 03:27:42 +0000 (11:27 +0800)

Trivial merge