Merge branch 'refs/heads/master' into develop
Fuck you, MySQL strict mode. Right in the eye.
No seriously. Fuck you, MySQL strict.
Formatting cleanup
Merge branch 'refs/heads/develop'