Let's merge the "master" branch with the "stables" branch

Okay, what will happen?