Merge branch 'release/1.2.1' into develop
Merge branch 'master' into develop
Update for beta 4.
Can no longer set CGFloats.
Merge branch 'release/1.3.0'