Merge remote-tracking branch 'ni/master'

This commit is contained in:
lassulus 2018-12-14 19:22:50 +01:00
commit a56497f72c

@ -1 +1 @@
Subproject commit 140bdfdf6c87c1822e0c4ec8f497a20ad1d4cf19
Subproject commit 21a894dc6f0a304655d2a30230510c8cb0e164b2