Flavours. Vanilla is my favorite :^)
Merge remote-tracking branch 'origin/develop' into develop