Dev up

And here we are again, updated to new master (basically-RC1)