master-qa-8106

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