Merge of 11-30-2014