Update usertrash from upstream