Preparing release 1.3
Merge branch 'javawriter2' into develop