Updated pick/drop.
Merge origin/master