Handle defaults for context invoke.  This fixes #201
Merge branch '3.x-maintenance'