[#561] More fixes
Merge branch 'master' of https://github.com/jOOQ/jOOQ.git