Removed deprecated Jakefile syntax
Merge branch 'v6'