Merge branch 'master' into 11850-singlecontainer-max-requirements
authorjiayong2 <jiayong@math.mit.edu>
Mon, 12 Feb 2018 20:05:29 +0000 (20:05 +0000)
committerjiayong2 <jiayong@math.mit.edu>
Mon, 12 Feb 2018 20:05:29 +0000 (20:05 +0000)
Arvados-DCO-1.1-Signed-off-by: Jiayong Li <jiayong@math.mit.edu>


Trivial merge