fixed installer.
Merge remote-tracking branch 'origin/4.10.x' into 4.10.x