Merge remote-tracking branch 'origin/devel'
authorSukru Senli <sukru.senli@inteno.se>
Fri, 15 Jun 2018 08:14:59 +0000 (10:14 +0200)
committerSukru Senli <sukru.senli@inteno.se>
Fri, 15 Jun 2018 08:14:59 +0000 (10:14 +0200)

Trivial merge