frenetic.3.1.0
Merge pull request #2390 from seliopou/master

frenetic.3.1.0