Avoid incompatible CSS changes during 0.12.x series.
Merge branch '0.12.x'