Upstream pull for 2013-05-28