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

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


Trivial merge