================================================================================

This is a patch release with some useful fixes for the 3.6 branch

Bug Fixes
---------
#4583 - JavaWriter uses regex syntax unsupported in Java <1.8
#4584 - SQL comments with javadoc terminators break generated code