Merge branch 'develop' into iOS7