Merge commit 'a84713e7'

This commit is a no-op.

* commit 'a84713e7':
  parseutils-test: Move some variable declarations to avoid block braces
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>