Closes #13 in 1.5.4 branch

McAfee PCI scan redirect issue