Merge branch 'vaadin7', remote-tracking branch 'origin/vaadin7' into vaadin7