Create a CIBuild Solution Configuration
Merge remote-tracking branch 'origin/master' into resurrect-client