Merge pull request #1263 from am11/master

Code: Misc Fixes
Bundle: Respect RunOnBuild setting. (#1259)