Attempted a fix for a strange connection error
Merge branch 'development' into 1.8