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