put this back on master... merging a submodule correctly i hope
preserve earlier order