Overrides.
Merge pull request #954 from mbebenita/master

Overrides.