brianchandotcom/liferay-portal — pull request #22317 by shuyangzhou (2014-11-18 23:44:27+00:00)
Title: Lps 51658

I will slowly find and apply this to proper locations.

I am not sure whether you want this to go back to 6.2?