Integrate updates from 2013-10-10 class.