Merge next back to devel

Also fixes #833