Merge branch 'fix/token-conflict' into 'master'
authorazul <azul@riseup.net>
Mon, 7 Aug 2017 08:37:13 +0000 (08:37 +0000)
committerazul <azul@riseup.net>
Mon, 7 Aug 2017 08:37:13 +0000 (08:37 +0000)
prevent token conflicts

Closes #8792

See merge request !42


Trivial merge