Merge remote-tracking branch 'ni/master'

This commit is contained in:
lassulus 2017-05-02 14:17:35 +02:00
commit 9afa716800