changes made via pull request talk.
Merge branch 'master' into iOS7