Stack-level tags support
'disable' directive
Merge branch 'master' of github.com:cotdsa/cumulus