A few changes pertaining to previous updates, and to tripwires.
Authored by: tswift 2016-01-22
Parent: [r8588]
Child: [r8590]