AUI-1026

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