Merge remote-tracking branch 'remotes/upstream/cm-14.1-rootless' into cm-14.1
authorStricted <info@stricted.net>
Sat, 22 Apr 2017 21:29:07 +0000 (23:29 +0200)
committerStricted <info@stricted.net>
Sat, 22 Apr 2017 21:29:07 +0000 (23:29 +0200)

Trivial merge