Syncing with the official JSPWiki 2.10.1 release
	Syncing with the official JSPWiki 2.10.1 release