Reflecting the changes from wicketstuff back to this repository.