Sorry, missed that this was already merged. See #1069 for new tracking bug.