VS Solution & Project file commits
Merge branch 'master' into power-ups