Yadli's patch to make things really square.
Merge branch 'master' into HEAD