Merge branch 'master' of https://github.com/kasscandra/bwc-engine
Merge branch 'master' of https://github.com/kasscandra/bwc-engine