0.2.7
Merge branch 'update' into update.macosx