JMA - Removed #define DEBUG flag.  Didn't mean to commit this.
Merge branch 'feature/extend-support-subweave' into feature/extend-support-subweave-local-osx-10.8.5