Merge branch 'nicer-share-urls' into 'develop'