merge new upstream version 0.7,1
authorReinhard Tartler <siretart@tauware.de>
Mon, 28 Jan 2019 22:16:35 +0000 (17:16 -0500)
committerReinhard Tartler <siretart@tauware.de>
Mon, 28 Jan 2019 22:16:35 +0000 (17:16 -0500)

Trivial merge