Update upstream.
Trade: My orders buy/sell bug. fixes #1101, fixes #315.