Merging in style updates from master