Merge branch 'master' into 3.6

for master updates

Conflicts:
	lo.js
	twittperator.js

1 files changed, 1 insertions, 1 deletions

diff --git a/_libly.js b/_libly.js
index 8c6f245..be989d7 100644
--- a/_libly.js
+++ b/_libly.js
@@ -247,7 +247,7 @@ libly.$U = {//{{{
           let pluginPath;
           Error('hoge').stack.split(/\n/).some(
             function (s)
-              let (m = s.match(/^(?:\(\))?@chrome:\/\/liberator\/content\/liberator\.js -> (.+):\d+$/))
+              let (m = s.match(/-> liberator:\/\/template\/chrome:\/\/liberator\/content\/liberator\.js -> (.+):\d+$/))
                 (m && (pluginPath = m[1].replace(/\?.*$/, '')))
           );
           return pluginPath;