master-qa-12037

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