am aa8467e5: Merge "Handle keynames with special characters such as - and ."
Brian Carlstrom authored
* commit 'aa8467e5':
  Handle keynames with special characters such as - and .
81a4e0fe