master-qa-5600

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