0.2.10
Merge branch 'update' into update.macosx