Merge branch 'master' into version-0.2.0-incubating-rc3