nothing new, recommended by git
Merge remote-tracking branch 'origin/master'

Conflicts:
	mod/iconicrep/view.php