Merge remote-tracking branch 'upstream/master'
Update iOS changelog.
Merge remote-tracking branch 'upstream/master'
Update iOS changelog.
Merge pull request #68 from ufosky/master

Update iOS changelog.