Merge of 12-07-2014