fix some merge issues.
update to 20170720
update to 20151201
Merge bmake onto the main branch.
Vendor import of bmake
This form allows you to request diffs between any two revisions of this file. For each of the two "sides" of the diff, enter a numeric revision.