Merge remote-tracking branch 'origin/master' into oxe

Conflicts:
	WebContent/debug.jsp
Merge branch 'master' into oxe