Merge Picasso 2.0 changes