Merge branch 'master' into next
-rw-r--r-- 18 .gitignore
-rw-r--r-- 844 javadoc.xml
-rw-r--r-- 3559 pom.xml
drwxr-xr-x - src