Merge branch 'v2.0' 18/1818/1
authorroot <root@SO-ub.lxd>
Fri, 12 May 2017 14:52:31 +0000 (14:52 +0000)
committerroot <root@SO-ub.lxd>
Fri, 12 May 2017 14:52:31 +0000 (14:52 +0000)

Trivial merge