Commit 70f7e2c6e3fc908dd6a4e027dc43d5ce5be94d75

Carlos Martín Nieto 2014-10-27T01:48:37

Merge from 2660