master-qa-10956

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