Merge remote-tracking branch 'ni/master'

This commit is contained in:
lassulus 2018-12-05 07:03:30 +01:00
commit e6bb260acd

@ -1 +1 @@
Subproject commit eb68146cc4848cfc0c0339c72a44a96fdeb4a1de
Subproject commit 140bdfdf6c87c1822e0c4ec8f497a20ad1d4cf19