Merge branch 'nipos-develop' into develop
authorlain <lain@soykaf.club>
Tue, 22 May 2018 14:02:53 +0000 (16:02 +0200)
committerlain <lain@soykaf.club>
Tue, 22 May 2018 14:02:53 +0000 (16:02 +0200)

Trivial merge