Merge branch 'MDL-61453-master-userpicturefiletype' of git://github.com/mudrd8mz...