Jumoo

Dependency updates and forward-ports