OHAttributedLabel 3.4.1
Merge branch 'master' into chipmunk-physics

* master:
  OHAttributedLabel 3.4.1
Revert other changes from other branches
revert other change for pull req