master-qa-6924

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