Fix how context reloads after save. (Manual merge from 5.12)
Authored by: b_calderwood 2012-03-12
Parent: [r6093]
Child: [r6095]