Include trash parameter.
Fix time variance.
Merge remote-tracking branch 'origin/master'