master-qa-3947

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