Rebase on master to pull in coding convention changes and fix compile time errors.