Merge Mater into this branch.
Fix CppLint warnings