JorgeFerrer/liferay-portal — pull request #375 by holatuwol (2014-05-23 19:39:55+00:00)
Title: LPS-47130

Updated with suggestions, separated different types of changes across several commits.