The source project of this merge request has been removed.
Several small edits; in future, will use finer-grained merge req's
Restore link removed in failed merges, other fussing with wording.
I Realize you're in prep for next release, so will hold off on more merge reqs for now.
Edited by Paul Theodoropoulos