Note that while the patch provides what was requested, the real issues here are bug #1492427 and bug #1492433
Note that while the patch provides what was requested, the real issues here are bug #1492427 and bug #1492433