Closes #3323574 This is using the latest changes introduced by smustgrave in #21, but with the alternate regex supplied by codebymikey in #15