tree dafdd213c34ab3faf16fcebe978e1eb5ab82c35c
parent e65abba584155b176c81ef2db4a4860fbd2f866c
author Jonathan Hart <jono@onlab.us> 1489467227 -0700
committer Jonathan Hart <jono@onlab.us> 1489467227 -0700

Cherry-pick changes from cord-2.0 to master

Change-Id: Idd46862112b52ce5c0b4cfd5b199a72eccad881e