Oh and, don't forget to rebase your branch onto master, then force push, before merging (as there have been updates to master).  Then update the task in Jira.