Merge from master

Production bits.