Imported changes due to terry-edits-20131206