fix potential compiler error.
Merge branch 'master' into testing