2.1.2:

  * Fixed: 'extra' entries would override database entries if they shared the
           same token