master-qa-4115

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