porting rmatter fix from stinger-svn
porting rmatter fix from stinger-svn

davidediger/stinger,davidediger/stinger,ehein6/stinger,ehein6/stinger,davidediger/stinger,sirpoovey/stinger,sirpoovey/stinger,ehein6/stinger,ehein6/stinger,davidediger/stinger,sirpoovey/stinger,sirpoovey/stinger,ehein6/stinger,ehein6/stinger,davidediger/stinger,ogreen/stinger,ogreen/stinger,davidediger/stinger,sirpoovey/stinger,sirpoovey/stinger,ogreen/stinger,ogreen/stinger,ogreen/stinger,ogreen/stinger