CLC-3377 - Syntax Error: Token 'semester.time_bucket' is unexpected
https://jira.ets.berkeley.edu/jira/browse/CLC-3377
Merge pull request #2192 from christianv/CLC-3377

CLC-3377 - Syntax Error: Token 'semester.time_bucket' is unexpected