Merge pull request #967 from arjantijms/4.0.0-prepare

Update mochito