Merge of derekwhite changes