master-qa-6925

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