Minor updates
Merge branch 'master' into iOS8