Fix #184 (?)
build
Merge branch 'develop' into feature/newsfeed-hyperlinks

* develop:
  Fix #184 (?)