cleanup - delete tmp.
Merge from sibling 'master' into 'eway'.