Xcode 6 / iOS 8 needs a scaleFactor
Merge branch 'xcode6-ios8' into as24-master

* xcode6-ios8:
  Xcode 6 / iOS 8 needs a scaleFactor