Merge branch 'install-subdir'