master-qa-4566

http://issues.liferay.com/browse/LIFERAYQA-4566