Merge branch 'wak-google-upstream1' (#223)