Merge \\"switch to default Trade Federation ABI class\\" am: e3235bbd8d