Merge of 12-06-2014