Merge branch 'develop' into glwidget-gtk3
authorJarl Gullberg <jarl.gullberg@gmail.com>
Tue, 13 Jun 2017 18:29:58 +0000 (20:29 +0200)
committerJarl Gullberg <jarl.gullberg@gmail.com>
Tue, 13 Jun 2017 18:29:58 +0000 (20:29 +0200)

Trivial merge