* 'develop' of https://github.com/phpbb/phpbb3:
[ticket/11329] Moving colors to colours.css
[ticket/9492] Fix missing phpbb_container in unit tests
[ticket/9492] Fix typo in SQL query
[ticket/9492] Ensure to delete the avatar/rank data when we change it
[ticket/9492] Ensure to update all avatar values when the avatar is changed
[ticket/9492] Fix undefined user_avatar_* values when updating the group avatar
[ticket/9492] Add unit tests for custom ranks and avatars
[ticket/9492] Retain custom ranks and avatars when setting users default group
[ticket/11328] Replace long buttons text with short text
[ticket/11328] Add language variables for buttons
d2e395b41f