Merge branch 'dev'
use onLock: instead of onConflict: since we are now upgrading Metacello as part of installation