Merge branch 'master' into mv
Merge branch 'master' into mv
Fix for iOS5