0.2.6
Merge branch 'update' into update.linux