Merge remote-tracking branch 'origin/master' into dab 4.0.0 4.0.1 4.0.2 4.0.3 dab/4.0.0 dab/4.0.1 dab/4.0.2 dab/4.0.3 dab_4.0.0 dab_4.0.1 dab_4.0.2 dab_4.0.3
authorJan-Simon Möller <jsmoeller@linuxfoundation.org>
Thu, 27 Jul 2017 15:33:11 +0000 (17:33 +0200)
committerJan-Simon Möller <jsmoeller@linuxfoundation.org>
Thu, 27 Jul 2017 15:33:11 +0000 (17:33 +0200)

Trivial merge