Versioned as part of Release Candidate for v1.6.2
Merge branch 'master' into STABLE
Merge branch 'master' into STABLE
Merge branch 'master' into STABLE

Conflicts:
	pom.xml
Versioned as part of Release Candidate for v1.8
Merge branch 'master' into STABLE
Merge branch 'master' into STABLE
Merge branch 'master' into STABLE
Merge branch 'master' into STABLE
Merge branch 'master' into STABLE
Merge branch 'master' into STABLE
Merge branch 'master' into STABLE
Merge branch 'master' into STABLE
Merge branch 'master' into STABLE
Merge branch 'master' into STABLE
Merge branch 'master' into STABLE
Merge branch 'master' into STABLE
Versioned as part of Release Candidate for v1.8.2
Merge branch 'master' into STABLE
Merge branch 'master' into STABLE

Conflicts:
	pom.xml