0.2.8
Merge branch 'update' into update.macosx