Fix minor typos.
Merge remote-tracking branch 'mpuels/master' into develop