liferay/liferay-portal — pull request #638 by ligasm (2014-10-30 11:51:01+00:00)
Title: https://issues.liferay.com/browse/LPS-47551

Sampsa could you have a look at this if it's OK.