Merge pull request #1 from friendica/2018.05-rc