changing default encryption token
Merge branch 'master' into changing_a_lot

* master:
  changing default encryption token