Fix reference to undefined variable.
Merge branch 'master' into uq