DO NOT MERGE. Use resolved path for both checking and opening. am: 8a2e551874 am...
Jeff Sharkey [Thu, 21 Jan 2016 05:08:07 +0000 (05:08 +0000)]
am: 354d1cefcc  -s ours

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


Trivial merge