Merge branch '1.5-install-fix'