Fixed clang 3.2 warnings.
Merge branch 'next' into sam_clang32