stupid copy/paste problem [KFSQA-1018]
Merge remote-tracking branch 'origin/master'