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

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


Trivial merge