bump to 0.6.3 custom code
Merge branch 'master' into twoten

Conflicts:
	scala-maven/pom.xml