Missing attributeerror catch on Windows...
Merge branch 'hotfix/issue319_v3'
Merge tag 'issue319_v3' into develop

Issue #319 v3...