Fix for #121, use java.util.Date.toString() for both util and sql Dates
Merge remote-tracking branch 'github/2.1-dev' into 2.1-dev