See doesn't die.  Drop submits an error code.
Merge branch 'refs/heads/master' into 2.0dev