brianchandotcom/liferay-portal — pull request #13335 by samuelkong (2013-08-23 11:31:05+00:00)
Title: LPS-19107

Do __not__ back port to 6.1.x