Merge branch 'feature/stabilization'
Merge branch 'master' into feature/stabilization
Merge branch 'master' into feature/stabilization
Merge remote-tracking branch 'origin/feature/stabilization'
Merge remote-tracking branch 'origin/master' into feature/stabilization
Crowdin injection w7 (from 20140206 to 20140211)
Merge conflict