am b5d92322: am 5c9d6e5b: Merge change Ie46db339 into eclair-mr2

Merge commit 'b5d92322eb9f9d9e78581b2ac5de35b95b46d113'

* commit 'b5d92322eb9f9d9e78581b2ac5de35b95b46d113':
  Remove "unused" opcodes from API.