Merge branch '2019.01-rc' into bug/6334-escape-get-app

diff --cc boot.php
Simple merge

diff --cc mod/lostpass.php
Simple merge

diff --cc src/Core/Theme.php
Simple merge

diff --cc src/Model/Profile.php
Simple merge

diff --cc src/Model/User.php
Simple merge

diff --cc src/Protocol/Diaspora.php
Simple merge

diff --cc src/Protocol/OStatus.php
Simple merge