Merge pull request #337 from jeffwilcox/dev

Updating ETW project
Merge remote-tracking branch 'upstream/dev' into dev