Final merge of Production_2014_Jan_21 branch into master