8b78aa
- Other as-yet-undocumented upstream fixes. - Fix failed locking messages to be more descriptive