master-qa-5245

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