Merge branch 'master' into 5538-arvadosclient-retry
authorradhika <radhika@curoverse.com>
Sat, 7 Nov 2015 13:42:38 +0000 (08:42 -0500)
committerradhika <radhika@curoverse.com>
Sat, 7 Nov 2015 13:42:38 +0000 (08:42 -0500)

Trivial merge