master-qa-8037

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