Merge branch 'macclane-notifications' into spartan