master-qa-3275

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