Merged with frankhommers pull request.

Signed-off-by: Adam Yeager <adam.yeager@gmail.com>