Fix for Bug 880699

better regex
Merge pull request #1173 from jwhonce/stage

[TO_STAGE] Fix for Bug 880699