DO NOT MERGE. Use resolved path when inserting and deleting. am: ebb842e081 am: 0a60a...
Jeff Sharkey [Thu, 18 Feb 2016 22:22:22 +0000 (22:22 +0000)]
am: 725e5f177d

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


Trivial merge