Quick fix- Deleting the menu broke things, but oddly not every time? Temporary work around so it at least runs consistently.
Merge remote-tracking branch 'origin/master'