Merge branch 'install-subdir' v1.2
authorChristian Herdtweck <christian.herdtweck@intra2net.com>
Tue, 22 May 2018 10:56:17 +0000 (12:56 +0200)
committerChristian Herdtweck <christian.herdtweck@intra2net.com>
Tue, 22 May 2018 10:56:17 +0000 (12:56 +0200)

Trivial merge