Merge of 11-10-2014