WIP
Merge branch 'master' of https://github.com/whysoserious/scalikejdbc-merge