Merge of 12-15-2014