Bug#84942 Fix for BoardClasses mashup
Merge pull request #95 from roadhump/feature/bug84942

Bug#84942 Fix for BoardClasses mashup