Merge pull request #954 from arjantijms/4.0.0-prepare

Merge master