Merge of 11-13-2014