* NEW: :lock => none
Merge branch 'master' into debug