Merged trunk revision 225993 into the hsa branch.