Merge branch 'fix-missed-typed-characters'
Merge branch 'fix-xcode5-compilation-warning'
Merge branch 'named-screenshots'