Merge of 11-03-2014