* use the hard-coded authors and thanks lists instead of bundled files and incorporate [22938] for trunk