Bug 1093874 2nd attempt

New pull request created for Bug 1093874, reverting dummy filechange commit
The test is failing when using this type of image. That's because the image is displayed in the Gallery app:
![2014-12-04-10-56-48](https://cloud.githubusercontent.com/assets/5293100/5295722/600fc4fc-7ba4-11e4-9c6d-8c237660bf44.png)