0.6.0 development release (Dan Marino Edition)
Merge branch 'master' into helix