* Merged spanish fix from @larjona