Merge of 11-23-2014