MovingBlocks/Terasology — pull request #1427 by flo (2014-12-06 13:07:15+00:00)
Title: Retry merge folder rename if it doesn't work for the first time after one second.

@Josharias reported that this is indeed fixing the crash issue he was having.