brianchandotcom/liferay-portal — pull request #21500 by mdelapenya (2014-10-13 07:48:58+00:00)
Title: Pushed to upstream

cc/ @tinatian. Reverting as this commit is breaking FTL resolution process