Merge branch master into snapshot