Copy paste error.
Merge pull request #2 from nigelgbanks/7.x-code-review

Copy paste error.
Merge pull request #3 from adam-vessey/7.x

7.x