More robust handling of accessor context lookup
Merge branch 'master' of github.com:brekka/pegasus