Merge branch 'master' of git.curoverse.com:arvados into 6465-optimize-workbench-integ...
authorManoj <jonam33@gmail.com>
Thu, 16 Jul 2015 19:18:13 +0000 (15:18 -0400)
committerManoj <jonam33@gmail.com>
Thu, 16 Jul 2015 19:18:13 +0000 (15:18 -0400)

Trivial merge