Merge branch 'master' into 5538-arvadosclient-retry
authorradhika <radhika@curoverse.com>
Fri, 6 Nov 2015 03:19:54 +0000 (22:19 -0500)
committerradhika <radhika@curoverse.com>
Fri, 6 Nov 2015 03:19:54 +0000 (22:19 -0500)

Trivial merge