Merge branch 'develop' into glwidget-gtk3
authorJarl Gullberg <jarl.gullberg@gmail.com>
Thu, 8 Jun 2017 11:35:29 +0000 (13:35 +0200)
committerJarl Gullberg <jarl.gullberg@gmail.com>
Thu, 8 Jun 2017 11:35:29 +0000 (13:35 +0200)

Trivial merge