Merge of 11-19-2014