master-qa-5792-6

http://issues.liferay.com/browse/LIFERAYQA-5792-6