Match method signatures.
Merge branch 'master' into horde_5_2