Merge branch 'garth/fix-issue-118'
Merge branch 'master' into next