Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/resources/context-mod.xml
Merge remote-tracking branch 'origin/master'