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

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


Trivial merge