Support for '.' context (current context value)
Merge branch 'master' into gh-pages