Merge branch 'master' into mv
Merge branch 'master' into mv
Fix for iOS5
Merge commit '89f200edcf2ece8fa168ecbec201b6751c19e28c'