Synchronize to version 0.4

This should fix [JENKINS-20282](https://issues.jenkins-ci.org/browse/JENKINS-20282).