brianchandotcom/liferay-portal — pull request #14847 by johnnyhowey (2013-10-24 18:27:33+00:00)
Title: LPS-41604

For master. Please backport to release branch for 6.2