merging r18473, fixing non-visible cursors
Authored by: mrieser 2012-02-16
Parent: [r18473]
Child: [r18475]