Merges from release branches should be more important for the primary develop branch than other merges to it.
Also found/fixed an annoying bug in the incremental drawing code.
Better way of separating release and feature branches
Merge branch 'feature/better_develop_placement' into develop