0.7.4.1

Please merge as soon as tests pass.