Fix a warning in 64-bit code.
Changing the umbrella framework mention.
Merge branch 'master' into arc