fuck it
for anton to fixQ
Merge remote-tracking branch 'origin/fredrikj'