Potential fix for issue #291
Merge branch 'develop'