Merge branch 'cursor-context-fix'

Conflicts:
reactive-relations.js