Upstream pull for 2013-09-10