Preparing 4.0.5-dev release
Merge remote-tracking branch 'upstream/develop' into develop