Merge with addons-trunk revno 7150