Merge branch 'next'

* next:
  fix, PEBKAC, comboLegs in new twsapi are shared pointers
  fix, PEBKAC, don't compare comboLegs against NULL with the new API.