master-qa-8319

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