Merge

Merge master into 1.0