uploads include all data now. image, thumbnails and keywords
Merge remote-tracking branch 'origin/master'