2.0.7 Release

Finalizing the 2.0.x series to begin work on 2.1