Merge branch 'master' into 5538-arvadosclient-retry
authorradhika <radhika@curoverse.com>
Wed, 4 Nov 2015 16:36:24 +0000 (11:36 -0500)
committerradhika <radhika@curoverse.com>
Wed, 4 Nov 2015 16:36:24 +0000 (11:36 -0500)

Trivial merge