Bug 1093874 2nd attempt

New pull request created for Bug 1093874, reverting dummy filechange commit