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

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


Trivial merge