Merge branch 'remove_keymanager_dep'
authorVarac <varac@leap.se>
Tue, 27 Jun 2017 18:10:59 +0000 (20:10 +0200)
committerVarac <varac@leap.se>
Tue, 27 Jun 2017 18:10:59 +0000 (20:10 +0200)

Trivial merge