Merge branch 'v2.0' 09/1809/1
authorroot <root@SO-ub.lxd>
Thu, 11 May 2017 14:18:41 +0000 (14:18 +0000)
committerroot <root@SO-ub.lxd>
Thu, 11 May 2017 14:18:41 +0000 (14:18 +0000)

Trivial merge