Automate import dance
Import bmake-20130520 to keep us in sync.
Tag bmake-20130520
Sync with upstream version (20130520) that includes same fixes made last week.