Import bmake-20121010 to new vendor branch