Defensive workarounds for a bug in the scala compiler
Merge branch 'introProtocol' of https://github.com/rlamb/Agent-Service-ATI-IA into introProtocol