Merge of 12-05-2014