changes for no shadowing
.
Merge branch 'master' into no-shadow
merge w/master
merge srclocs for is
Merge branch 'no-shadow'
oops on a swo