Speakers machine name was renamed and some other..
Speakers machine name was renamed and other features
Merge branch 'master' into fields_update