DO NOT MERGE. Use resolved path for both checking and opening. am: 8a2e551874 am...
Jeff Sharkey [Thu, 21 Jan 2016 02:00:17 +0000 (02:00 +0000)]
am: 1c88cf50a5

* commit '1c88cf50a5220ec6105813392be5ed34b98c7b9e':
  DO NOT MERGE. Use resolved path for both checking and opening.


Trivial merge