Place ad-hoc stuff from docs under context
Merge pull request #2524 from victorcoder/devel

Place ad-hoc stuff from docs under context