Compose button changed from settings cog
Merge remote-tracking branch 'origin/master2' into master2
Compose button changed from settings cog