Merge commit 'c30ad3a3fcfc66d0c1757a50afe413d9942d7793' into less-critical
-rw-r--r-- 8 .gitignore
-rw-r--r-- 35147 COPYING
-rw-r--r-- 3518 pom.xml
drwxr-xr-x - src