Merge Master into 0.6

Merge Master into 0.6