Merge branch 'hotfix/3.3b'
I guess "NOW()" can't be passed as a MySQL function.
Merge branch 'hotfix/3.3.1' into Development