Merged missing changes from revision alexander.nozdrin@oracle.com-20111219114211-49pqi0wfs9p4o9yi
Attach a file by drag & drop or click to upload
