Add -x flag to "git clean" so that EVERYTHING is blown away before checking out new branch
Merge branch 'release-2.0-nightly' into release-2.0