Merge with Trevor.

diff --cc .be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/d9959864-ea91-475a-a075-f39aa6760f98/comments/1f25cba2-03ee-43e1-a042-ef6724938ad8/body
index d2ef28caf20f6bcbbd29da5ccc1078ab550a4082,0000000000000000000000000000000000000000..d2ef28caf20f6bcbbd29da5ccc1078ab550a4082
mode 100644,000000..100644
--- 1/.be/bugs/d9959864-ea91-475a-a075-f39aa6760f98/comments/1f25cba2-03ee-43e1-a042-ef6724938ad8/body
--- /dev/null
+++ b/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/d9959864-ea91-475a-a075-f39aa6760f98/comments/1f25cba2-03ee-43e1-a042-ef6724938ad8/body

diff --cc .be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/d9959864-ea91-475a-a075-f39aa6760f98/comments/1f25cba2-03ee-43e1-a042-ef6724938ad8/values
index ca3efd060560496dcd8d1ab3eb3fda0bad681d35,0000000000000000000000000000000000000000..ca3efd060560496dcd8d1ab3eb3fda0bad681d35
mode 100644,000000..100644
--- 1/.be/bugs/d9959864-ea91-475a-a075-f39aa6760f98/comments/1f25cba2-03ee-43e1-a042-ef6724938ad8/values
--- /dev/null
+++ b/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/d9959864-ea91-475a-a075-f39aa6760f98/comments/1f25cba2-03ee-43e1-a042-ef6724938ad8/values

diff --cc libbe/command/close.py
Simple merge

diff --cc libbe/command/open.py
Simple merge