Clean up warnings. Fixes trac #9377.
Merge branch 'develop' - clean up warnings.