Merge changes up to 20131112 update.