Merge of 11-16-2014