It was looking really weird to read this in the source:
At first I thought it must be a merge-problem ;). I'm sorry that the diff on Github is looking THAT ugly, there are NO code-changes in, just indentation changes.
fix some missing indentations in main.cpp for better readability
Those are artefacts from previous refactorings, in an attempt to prevent unreadable diffs in the first place.
It's probably a good thing to fix those before release.
ACK (long live git diff -b)
git diff -b