@rnowosielski, @istanishev The reason I added you two as reviewers was to ask if there should be any limitations in place to prevent branching "incorrectly" (ie. not following the git-flow branching model described in the readme). I know I've made that mistake a couple times and it's making the history a bit messy/confusing.
Other than that, this PR is just to merge the changes in 2.1.0 back to master, so I'll merge it
@rnowosielski, @istanishev The reason I added you two as reviewers was to ask if there should be any limitations in place to prevent branching "incorrectly" (ie. not following the git-flow branching model described in the readme). I know I've made that mistake a couple times and it's making the history a bit messy/confusing.
Other than that, this PR is just to merge the changes in 2.1.0 back to master, so I'll merge it