Towards a vc11 fix
Reworking MSW resource invocation macro to include file path hint
Merge branch 'vc11mods' into dev