Merged master to rc/2013-11-21, so we can merge it back to master.