master-qa-10807

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