Merge branch 'ostatus' into develop
authorRoger Braun <roger@rogerbraun.net>
Sun, 23 Apr 2017 08:37:29 +0000 (10:37 +0200)
committerRoger Braun <roger@rogerbraun.net>
Sun, 23 Apr 2017 08:37:29 +0000 (10:37 +0200)

Trivial merge