Merge branch '5010-trash-button-for-collections'
authorTim Pierce <twp@curoverse.com>
Mon, 26 Jan 2015 15:52:49 +0000 (10:52 -0500)
committerTim Pierce <twp@curoverse.com>
Mon, 26 Jan 2015 15:52:49 +0000 (10:52 -0500)
Fixes #5010.


Trivial merge