Commit af6cc38fc0acba14277ebfd247e0a46a867a2c33

Carlos Martín Nieto 2014-09-30T04:38:05

Merge remote-tracking branch 'upstream/master' into cmn/describe