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

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


Trivial merge