1.3 release
Merge branch 'master' into devel

Conflicts:
	pom.xml
Updated the parent pom version to 1.6-SNAPSHOT.