Bring these two together, hopefully right this time

We can't have two different branches with different fixes on, I say from now on that all fixes are made on 0.9-dev and when a suitable amount of fixes have been made they are then merged into master, at which point a new tag is made.