Update to the latest version from the mvo5 dev branch