Merged changes from revision 4817 from launchpad