master-qa-5255

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