When using the workflow branch -> develop branch -> master branch methodology, what is the best way of handling fixes for bugs in new code (that isn\'t already in master)