Merge from 2/2/2013 changes