Track upstream changesets 1405 and 1406.