Merge branch 'hotfix/wildcard_error'
Merge branch 'release/0.9.5'
fix for bug #4485
Merge branch 'hotfix/0.9.6' into develop