Merge branch 'master' into appserver-io
Merge branch 'master' of https://github.com/appserver-io/appserver into appserver-io
Merge pull request #308 from wagnert/master

Merge with wagnert/master