Merge branch 'master' into mv
Merge branch 'master' into mv
Fix for iOS5
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  Fix for iOS5