All the style commits bringin master branch up to date with styles.