Fix build.
Merge branch 'master' into testing