Strategies controller fix
Merge remote-tracking branch 'origin/scott' into sarah