Extensions rebase

Ok, here's a mergeable PR @icecrime @shykes.

1.4 should be safely included.