Merge branch 'release-0.3.5' into develop
Merge branch 'master' into develop
Fix for recursive get_context causing maximum recursion depth exceeded
errors
Bumped version number
Merge branch 'release-0.3.6'