Update for osh-20130331 branch