Merge branch 'master' into 11850-singlecontainer-max-requirements
authorjiayong2 <jiayong@math.mit.edu>
Thu, 1 Feb 2018 21:07:04 +0000 (21:07 +0000)
committerjiayong2 <jiayong@math.mit.edu>
Thu, 1 Feb 2018 21:07:04 +0000 (21:07 +0000)
Arvados-DCO-1.1-Signed-off-by: Jiayong Li <jiayong@math.mit.edu>


Trivial merge