Merge branch 'master' into pluggable-parsers

Conflicts:
	lib/prawn/table/cell/text.rb
	lib/prawn/text/formatted/parser.rb