Merge branch 'master' into friendly_url