DO NOT MERGE. Use resolved path when inserting and deleting. am: 600d3afcc3
Jeff Sharkey [Thu, 18 Feb 2016 22:22:17 +0000 (22:22 +0000)]
am: dee8c810c8

* commit 'dee8c810c8edbb90e43db69a4ed1b7d2ee375d07':
  DO NOT MERGE. Use resolved path when inserting and deleting.


Trivial merge