Merge master into feature/stabilization
Crowdin injection w3 - Add Norwegian files on 20140116
Merge feature/stabilization to master
Merge remote-tracking branch 'origin/master' into feature/infinispan-full-integ