Merge proposals dependent on lp://qastaging/~camptocamp/c2c-rd-addons/change_author_name_20130108

1. change_author_name_20130108
2. Dependent merge proposals