Merge of 11-08-2014