Fixes for clean installation.
Merge remote-tracking branch 'github-master/master'