[gcl/f19] Update to 20130521 snapshot for bug fixes. Rebase patches.