Merge changes from 20130827 update.