Merge branch 'master' into feature/stabilization
zh-CN injection on 20131124-050833
Crowdin injections w49 (from 20131206 to 20131209)
Merge branch 'feature/stabilization'
Merge branch 'feature/stabilization'
CAL-824 merge master -> edit-repetitive-events