r2805 - pull bugfix from maintenance branch into trunk