Merge of 12-20-2014