merge with latest code from windows (thesis) version, i.e. also the version used for vision 2012 trade fair