Merge pull request #1153 from pingunaut/wicket-7

Wicket Update and merge master