master-qa-4926

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