Merge branch 'master' into feature/stabilization
es-ES injection on 20140708-004953
Merge branch 'feature/stabilization'