Trim setting's key before saving
Trim setting's key before saving

* origin/master:
  Trim setting's key before saving