image uploader button ext cutoff bugfix
Merge remote-tracking branch 'origin/master'