Merge changes from 20131220 update.