Merge branch '11543-uploadfile-collection' refs #11543
authorPeter Amstutz <peter.amstutz@curoverse.com>
Tue, 23 May 2017 19:52:05 +0000 (15:52 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Tue, 23 May 2017 19:52:05 +0000 (15:52 -0400)

Trivial merge