Update based upon what Dan found in QA.
Merge pull request #3 from jordandukart/7.x-METRO-88

Update based upon what Dan found in QA.