Merged changes from Valve's installer