master-qa-10682

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