Merge branch 'hotfix/empty_sql_element'
CFTime generator compiles, but didn't fix it beyond that. I don't think it's worth maintaining this code.
Merge branch 'hotfix/cftime_update' into develop