Merge branch 'mojo' into users.v3j