Fix "Rebase onto master"

Merged Valery Sizov requested to merge fix_rebase into master