master-qa-3663

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