Fixed scoping, removed generic type from local mock and changed name of local quickfix to 'local' from 'inline'
Merge remote-tracking branch 'origin/master'