Fixing out-of-tree builds.
Merge branch 'master' into gpu