Update scripts for branch maintenance.
Propagating changes from blankslate branch.