master-qa-5295

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