merge talko/ELCImagePickerController/commit/642e6cf144e213cc1d5ccd91a57f4ec32658e191