Minor merge conflict changes: * remove local scoping * PR was based on master, this is being merged in v3.0.6 Signed-off-by: Eric F Crist <ecrist@secure-computing.net>
Minor merge conflict changes: * remove local scoping * PR was based on master, this is being merged in v3.0.6 Signed-off-by: Eric F Crist <ecrist@secure-computing.net>