haven't had a release in forever, so what the hell.
Merge branch 'release/0.6.0' into develop