Update memento
Update memento
Merge pull request #861 from Metaswitch/update_memento

No reviewer: Update memento