Merge devel

...not to do this recklessly.