should fix #389
Merge remote-tracking branch 'upstream/development' into development