Update to trunk r201012

Can you please look at how to better solve the merge conflicts with r200513?