Merge branch 'master' of https://github.com/MrTJP/ProjectRed into 1.7-port
Fix some bugs in 1.7 port