Merge master into 0.6