Possible fix for #175
Merge branch 'dev'
Version 2.6.5