0.6.0 new

All features in this branch are good to go for the next release.
I'm sorry, perhaps merging was premature. In case you're still working on it, you can just push to the same branch, and we can later integrate the differences.