Potential fix for #1216
Merge branch 'develop'