Merge branches '0.4' and '0.4' of github.com:EOxServer/autotest into 0.4
Merge branch '0.4'