Imported patches from topgit branches (tg/*).