DO NOT MERGE. Use resolved path for both checking and opening. am: 8a2e551874 am: e13f6fa9b6 am: 8e6c809370  -s ours am: 46a4c650bb am: 1aaf16b00e  -s ours am: 47784d61cf am: ae7d56abe4
am: 224c8b5d4e  -s ours

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