brianchandotcom/liferay-portal — pull request #17507 by epgarcia (2014-03-24 09:33:18+00:00)
Title: LPS-45163

LPS-45163 Rebased