master-qa-4055

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