Merge commit 'b63b6033ed0befafb5b595c5bb57cfb43ecc4d35' into 0.6.0
Merge branch '0.6.0' into osx