iPhone4 scale testing
Merge branch 'master' of ../stage