Fixed #490 -- corrected a regexp that failed to compile
Merge branch 'master' of https://github.com/topazproject/topaz