I'm probably missing something (I'm guessing, the merging of master back into this branch) but that's a lot of noise for add_image changes.