Fix typo in dependency checking.
Merge branch 'master' into 0.19.x