commit before merge
Merge remote-tracking branch 'origin/wicket' into wicket

Conflicts:
	src/main/java/com/example/wicket/bootstrap/paginator/BootstrapPaginator.java