Basic support for stopcasting and stopusing
Merge branch 'master' into the_great_refactor
Fixed conflict
Various fixes to support shields