Merge branch 'refs/heads/1.1/master' into 1.1/develop
Couple of fixes needed due to windows mysql server being odd
Merge branch 'refs/heads/1.1/master' into 1.1/develop