Fixed mistake in rebuild script
Merge branch 'master' into providerRefactor