Bolt does not find custom Units in Assembly Definitions

I have a lot of common/reusable code in an assembly definition. When I run "Build Unit Options", these units are not included. After a day of banging my head against the wall trying to figure it out, I eventually debugged it against the source code. The reason is that the Codebase.cs file checks if it is a user assembly by checking 

private static bool IsUserAssembly(AssemblyName assemblyName) 
{ 
var name = assemblyName.Name; 
return name == "Assembly-CSharp" || name == "Assembly-CSharp-firstpass"; 
} 

Obviously, my assembly definition does not have one of these names so it classes it as an editor assembly instead and ignores it for custom units