master-qa-5932

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