Merge remote-tracking branch 'remotes/upstream/cm-14.1-rootless' into cm-14.1
authorStricted <info@stricted.net>
Tue, 9 May 2017 11:35:50 +0000 (13:35 +0200)
committerStricted <info@stricted.net>
Tue, 9 May 2017 11:35:50 +0000 (13:35 +0200)

Trivial merge