Update GWToolset to master

Change-Id: I5c20b154dbc29943bfb1ff92f896791a9119f6b7