Merge branch 'hotfix/unbork-user-page'
Merge branch 'release/1.3.1'
Oops, a tiny bit of unfinished layout testing ended up in Task view
Merge branch 'hotfix/unfinished-layout' into develop