Merge branch 'better_reshuffling' into 'master'
Better reshuffling
See merge request hej/reversed_hej!2