gustafn
committed
on 23 Feb 16
- set always token_id, when it is passed as ""