Put the freqid as an int.
Merge remote-tracking branch 'origin/API-20140530' into API-20140530