Merge master to our new feature set

Wow, that wasn't easy - master is moving forward fast as we need to be flexible and react to our users' needs. And the new feature set changes a lot of internal things. So there are always a "big" clashes.