Merge remote-tracking branch 'upstream/master'
The GUID in the link to the items has to be encoded, since it could contain special characters
Merge pull request #207 from annando/master

Encode the URLs with GUIDs