Merge "Messenger refuses all file:///data/ uris" into nyc-dev