Only include master
Merge branch 'master' into ios7