AUI-1125

https://issues.liferay.com/browse/AUI-1125