[Merge] lp:~kai-mast/friends/links into lp:friends

[PS Jenkins bot]

Review: Needs Fixing continuous-integration

FAILED: Autolanding.
No commit message was specified in the merge proposal. Hit 'Add commit message' on the merge proposal web page or follow the link below. You can approve the merge proposal yourself to rerun.
https://code.launchpad.net/~kai-mast/friends/links/+merge/202954/+edit-commit-message

-- 
https://code.launchpad.net/~kai-mast/friends/links/+merge/202954
Your team Super Friends is subscribed to branch lp:friends.