brianchandotcom/liferay-portal — pull request #18700 by shuyangzhou (2014-05-21 23:46:21+00:00)
Title: Lps 47071

Brian, please don't close the ticket.

After you refactor and merge this in, I will start to apply it.