Merging dev into master!

'Nuff said.