Pulling changes from cantino/huginn.