Fixed bad merge.

5 jobs for v0.7.0 in 18 minutes and 38 seconds (queued for 1 second)