Import bmake-20130604
Tag bmake-20130604
Import bmake-20130730 - allows folk to supress job tokens.
Tag bmake-20130730
Import bmake-20130904
Tag bmake-20130904
Merge bmake-20130904