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

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


Trivial merge