Forgot to include this in previous commit.
Authored by: dwarren 2016-02-06
Parent: [r8623]
Child: [r8625]