Updates to latest dev
Merge branch 'master' of https://github.com/Supremicus/bluesteel