Update git flow

@mitfik see https://github.com/jcieslar/guidelines/blob/master/git.md#applying-fixes

Bugs in master are fixed directly on master.