master-qa-4727

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