Merge branch 'master' into url_addresses