Merge "Always clone golden files before editing them." into qt-dev