Merge pull request #309 from Cipa/develop

fix for #303
Merge remote-tracking branch 'remotes/upstream/develop' into develop