Merge branch 'master' into next
authorMatthias Schmidt <gravatronics@live.com>
Sun, 2 Sep 2018 11:22:59 +0000 (13:22 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Sun, 2 Sep 2018 11:22:59 +0000 (13:22 +0200)
commit87a46a30cf227ef694421c726d5aa5dc59ed350d
tree9ac6482ceeb335fbc69944070c0ebf967ee91e18
parent1e0b7b1b325b923ab5adc6e9e14f2636e84a477a
parentb6e41ae7c2429e0606731aeec391ea9f8b3dee18
Merge branch 'master' into next