Merge with addons/trunk revno 8168.