0.2.9
Merge branch 'update' into update.macosx