Merge branch 'master' into devel

Conflicts:
	zanata-sync-service/pom.xml