Original patch by sgpm Closes #1850 Signed-off-by: Machiavelli <machiavelli.trinity@gmail.com>
4c23eb9fe2