Fix dictionarize_attributes that has moved
Merge branch 'master' into fixed-duration-timebags