Merge changes from 20131126 update.