Merge pull request #1343 from ozh/master

Stuff related to public shortening[1] & user auth[2]