Adds ability to rename branches, fixes small bug
Merge upstream
Merge upstream