Prepare release
Revert "Prepare release"

This reverts commit 7b2a872917e02997bb1cdbd55e10d1740a7cc851.
Work around Xdebug issue where lines that do not exist are marked as being executed
Merge branch '2.0'