Quadicon fix - upstream only
Merge pull request #751 from jkrocil/reintroduce-quad-fix-upstream

Quadicon fix - upstream only