master-qa-3999

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