Merge branch 'master' of https://github.com/apache/gora into GORA-692

 Conflicts:
	pom.xml