Merge of 12-19-2014