master-qa-8945

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