Better warnning info - tells you which controller failed
Merge remote-tracking branch 'upstream/hydro-devel' into hydro-devel
Merge pull request #297 from davetcoleman/hydro-devel

Better warning info - tells you which controller failed