Merge remote-tracking branch 'origin/master'

Conflicts:
	pretty/pretty/table.py
	pretty/tools/builder.py
	pretty/tools/utils.py
Merge remote-tracking branch 'origin/master'

Conflicts:
	pretty/tools/utils.py