Merge remote-tracking branch 'origin/obi/master-20110412'