Log Message: Merge changes from bmake-20150505, the hard way because the last update was incomplete and not using cvs import.