Merge branch 'trunk'
Merge trunk into master for release and update readme
Update javadocs for 1.11 release
Update version number in pom.xml
Merge branch 'master' into trunk
Merge mast back into trunk and prepare for next release