Bring v0.6.0-dev up to speed with fixes on v0.5.5

Bringing `v0.6.0-dev` up to speed with branch `master`. I don't see any changes though; were any changes committed on the `v0.6.0-dev` branch or was it just set up to get ready?