Merge from @godfat