Merge of 11-01-2014