Add mapping for open url
Merge branch 'master' into mac