Restart if next map is the same
Merge branch 'master' into librocket