1851 audit upgrade

So strangly this is the branch that is pulling in ticket 2418 with the changes that it needs from 1851.  So ticket 1851 is not really merging, 2418 is, even though the branch is called 1851.