Merge branch '10401-run-upload-dir' refs #10401
authorPeter Amstutz <peter.amstutz@curoverse.com>
Mon, 27 Mar 2017 19:54:41 +0000 (15:54 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Mon, 27 Mar 2017 19:54:41 +0000 (15:54 -0400)

Trivial merge