Change default value of regexp option in macaronage() to None
Merge branch 'master' into extend-qs