Master vs. Stable-0.5

Looking into whether this'd be a good change to make.