Merge branch 'master' into handle-rest-url