This was inspired by problems found with new regexps proposed in PR #690 Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>