cli friendly output.
Merge remote-tracking branch 'origin/master'

Conflicts:
	converter/attachments.php
	converter/user-avatar.php
Merge remote-tracking branch 'origin/master'

Conflicts:
	converter/attachments.php
	converter/user-avatar.php