Merge proposals dependent on lp://staging/~nataliabidart/magicicada-client/other-import-fix-for-precise

1. other-import-fix-for-precise
2. Dependent merge proposals