Fixed warnings due to unused variables.
Merge commit 'f1252a2'