am e83d8a69: Merge "Fix memory leak in parse_action"

* commit 'e83d8a6900ee53942e5939656c3b6ae177d1f1d2':
  Fix memory leak in parse_action