Pull ThiefMaster's patch-3..5.