Merge "Step versions on master after release"