Merge branch 'master' into next
authorMatthias Schmidt <gravatronics@live.com>
Mon, 7 Jan 2019 17:40:17 +0000 (18:40 +0100)
committerMatthias Schmidt <gravatronics@live.com>
Mon, 7 Jan 2019 17:40:17 +0000 (18:40 +0100)
commit83dcabb66d33684cd83a4c85b1803838aeede2f2
treed3f0a393f5c18a0601263b8d1a33841279efdd0d
parent367dae3425d4e09dbce72bf73e7fe20d12d15348
parent45c365428af9023e9e813c7e29cfbec6fc57eb17
Merge branch 'master' into next