master-qa-5031

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