NOJIRA Oops. Fix regex.
Merge branch 'master-fix' into develop

* master-fix:
  NOJIRA Oops. Fix regex.