Merge pull request #991 from arjantijms/4.0.0-prepare

Merge master into 4.0.0-prepare