Comment 12 for bug 486157

MIss read the changelog. Changing bug to a merge request and attaching diff's.

Charlie