Cleanup of #717 have corrupted the joined strategy.
Fix strategy cleanup of #717.
Hey, I merged this, but had to roll it back right away because I realized it was against master. Also, it seems like Travis never got run on it?
Yeah sorry, I was getting confused with an extra commit when I PR form master to dev (#699) and finally Instead of doing it from dev to dev, I do it wrong...
No worries. :-)