Merge branch 'w40_MDL-35619_m23_otheravatars' of git://github.com/skodak/moodle into...