Fixed not all tests being included
Merge branch '1.x-maintenance'
Added 2.0 to the changelog