Forgot to commit this with last release.
Authored by: tswift 2016-12-11
Parent: [r8883]
Child: [r8885]
