am 0da4ad42: Merge "Don\'t register methods when there\'s nothing to register."

* commit '0da4ad425d52d1aeec16b31b784c456753532dc2':
  Don't register methods when there's nothing to register.