am aa8467e5: Merge "Handle keynames with special characters such as - and ."

* commit 'aa8467e59b561f454ff7ec902aae688145d8d297':
  Handle keynames with special characters such as - and .