Merge remote-tracking branch 'remotes/upstream/cm-14.1-rootless' into cm-14.1
authorStricted <info@stricted.net>
Sat, 20 May 2017 17:40:09 +0000 (19:40 +0200)
committerStricted <info@stricted.net>
Sat, 20 May 2017 17:40:09 +0000 (19:40 +0200)

Trivial merge