Merged in change that fixes #4157 - orders api wasn't including tax