Merge death-march into master

It's time... :camel: