master-qa-2738

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