Merge branch 'obi/master-20110329' into experimental