[WIP] preparations for 6.2 and piwik 2.x ...