Redbasic - get rid of max-height for images (got lost in the merge last time it was fixed)
Merge remote-tracking branch 'upstream/master'