Merge remote-tracking branch 'origin/master' into leap_master master
authorVarac <varac@leap.se>
Fri, 13 Oct 2017 12:22:08 +0000 (14:22 +0200)
committerVarac <varac@leap.se>
Fri, 13 Oct 2017 12:22:08 +0000 (14:22 +0200)

Trivial merge