x taking Vector2.
Merge branch 'origin/master'
Changed scaledSize to be desired cap height rather than line height.

#1033