As Matúš already is an established contributor I won't semi-automatically just push this patch, but want to wait for our C++ / STL experts (I am not) to actually review it... --tml