Removed manual underline drawing on iOS 7, fixes #723
Merge branch 'od/issue_723' into develop