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

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


Trivial merge