Merge remote-tracking branch 'origin/develop' into 2018-12-17-update-frontend
authorlain <lain@soykaf.club>
Mon, 17 Dec 2018 20:19:00 +0000 (21:19 +0100)
committerlain <lain@soykaf.club>
Mon, 17 Dec 2018 20:19:00 +0000 (21:19 +0100)

Trivial merge