Fix debuggability in FSI
Merge branch 'master' into HtmlTypeProvider
Fixes after merge