Merge branch 'master' into feature/stabilization
Crowdin injections w48 (20131125)
Crowdin injections w49 (from 20131205 to 20131209)
Merge remote-tracking branch 'origin/feature/stabilization'
Merge remote-tracking branch 'origin/master' into feature/infinispan-full-integ