DO NOT MERGE. Use resolved path for both checking and opening. am: 8a2e551874 am...
Jeff Sharkey [Thu, 21 Jan 2016 01:49:04 +0000 (01:49 +0000)]
am: 224c8b5d4e  -s ours

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


Trivial merge