Merge MineSQL:master into DavidRockin:master

:cake: