Merge remote-tracking branch 'upstream/master' into trunk
Merge remote-tracking branch 'upstream/master' into trunk
Merge branch 'trunk', remote-tracking branch 'upstream/master' into trunk
Merge branch 'trunk' of github.com:michaelmosmann/wicket into trunk