Default user id
Should be final fixes for mysql strict mode
Merge branch 'refs/heads/develop'