Manifest for both jars
Merge branch 'master' into gh-pages
Updating builds