Commit ee89941fa2b861332defb5e3a8ce12c23c496ed7

Carlos Martín Nieto 2017-01-09T20:59:43

Merge remote-tracking branch 'upstream/maint/v0.25'