Merge remote-tracking branch 'remotes/origin/master' into sr

Conflicts:
	wikapidia-utils/pom.xml