Pull in any changes from Design Hacks which also belong in master.
Pull in any changes from Design Hacks which also belong in master.