fix #615
Merge remote-tracking branch 'origin/master' into 1.4.6
locate plugin specific rewrite rules in plugin
fix typo