Merge of 11-09-2014