robertoDiaz/liferay-portal — pull request #75 by JorgeFerrer (2014-02-03 09:00:25+00:00)
Title: LPS-43974 and LPS-42531

I have tested the solution and it fixes the problem, but please do some further testing of possible regressions