Merge of 11-12-2014