Merge branch 'MDL-25886-user_picture_fields' of git://github.com/mudrd8mz/moodle