Fix the build failure from merging tmp/issue-742 & tmp/insert-or-update
Merge pull request #804 from slick/tmp/fix-insert-or-update

Fix the build failure from merging tmp/issue-742 & tmp/insert-or-update