Merge branch 'ivan'
Merge branch 'master' into andy
Merge branch 'andy' of https://github.com/devknights/heatstroke into andy