Merge branch '6221-write-trash-list'
authorBrett Smith <brett@curoverse.com>
Mon, 3 Aug 2015 16:08:52 +0000 (12:08 -0400)
committerBrett Smith <brett@curoverse.com>
Mon, 3 Aug 2015 16:10:19 +0000 (12:10 -0400)
Closes #6221, #6673.


Trivial merge