more GNU-like
Merge branch 'dev'