Better handling of horizontal position.
Authored by: emassip 2012-02-14
Parent: [r8866]
Child: [r8868]
