local changes
Merge remote-tracking branch 'origin/master'
Csharp source for wix custom action
Merge remote-tracking branch 'origin/master'