Merging master into 1.0.0