Merge rc/2013-11-21 to master