Merge branch 'trunk' into net_quotas