Merge bmake-20140101 from vendor