Final^2 merge of Production_2014_Jan_21 into master

This is the one!