master-qa-3591

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