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

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


Trivial merge