Merge master into NoMoreComet