Merge branch 'MDL-61453-master-userpicturefiletype' of git://github.com/mudrd8mz...
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 1 Mar 2018 00:45:47 +0000 (08:45 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 1 Mar 2018 00:45:47 +0000 (08:45 +0800)

Trivial merge