check for better text in the vaadin apps
Merge branch '1.12'