Fixes #1258
Merge pull request #1259 from jrrideout/issue-1258

Fixes #1258
Merge branch 'master' into issue_1160