Merge branch 'release/4.0.0' attic/tags/cdm-vaadin/4.0.0/27922
authorjenkins <jenkins-int@bgbm.org>
Tue, 3 May 2016 11:57:00 +0000 (13:57 +0200)
committerjenkins <jenkins-int@bgbm.org>
Tue, 3 May 2016 11:57:00 +0000 (13:57 +0200)

Trivial merge