master-qa-5777

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