Merge branch 'develop' into glwidget-gtk3
authorJarl Gullberg <jarl.gullberg@gmail.com>
Sun, 25 Jun 2017 11:45:05 +0000 (13:45 +0200)
committerJarl Gullberg <jarl.gullberg@gmail.com>
Sun, 25 Jun 2017 11:45:05 +0000 (13:45 +0200)

Trivial merge