Merge of 11-02-2014