well, I must say that TWIG has bugs, such as this which was causing Strict Notice: Only variables should be passed by reference in /home/matt/dev/piwik-master/core/Twig.php on line 187
Merge remote-tracking branch 'origin/2.x-twig' into 2.x-twig