Transition merge

Sorry for that, I missed that it automatically merges to stable instead of master...