Merge branch 'garth/fix-issue-203'
Merge branch 'garth/fix-issue-202'
Merge branch 'garth/fix-issue-239'
Fix small doc typo
Merge branch 'master' into next