Merge changes from 20130710 update.