Merge independent repo conflink into this one
authorIan Kelling <ian@iankelling.org>
Sun, 16 Apr 2017 00:41:54 +0000 (17:41 -0700)
committerIan Kelling <ian@iankelling.org>
Sun, 16 Apr 2017 00:41:54 +0000 (17:41 -0700)
Merge remote-tracking branch 'conflink/master'


Trivial merge