Dealt with context issues on subcomponents
Nevermind.
Merge branch '2.x' of github.com:balderdashy/mast into 2.x