Merge branch 'fixedrate' into nodelet