Position context menu at correct location
nit
Merge branch 'master' into context_location
nit feedback
Merge pull request #982 from sunglim/context_location

Position context menu at correct location