Updated style and source from master.