Merge remote-tracking branch 'upstream/master'
Enhancing the test generator script to make it able to handle test case like "<html>foo<\\1>"
Merge branch 'master' of https://github.com/istvans/mpllibs