merged svn revision 33114 and added desktop and help plugins