adjusted for iPhone 4
Merge branch 'chowk-fma-brazil'