Add markup of string lost in merging develop to rails-3-develop.