Merge pull request #189 from nhr/master

Updates for OSE 1.2 and bootstrapper