master-qa-8052

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