Merge dev into master

Looks stable to me!