Delivering 0.5.0
Merge branch '0.5' into 0.6