changed database to mysql2
disabling rotation for now
committing to apply stash
using mysql2 now for real
bug fix
Merge branch 'master' into develop