Added changes made by https://github.com/square/picasso/pull/365/files