javadoc
testFixes
Merge branch 'refs/heads/LinusBranhc'