Only set inline height style if img is not yet loaded

The onload handler that removed the height gets never called if the img
is already loaded.

Fixes problems with incorrect aspect ratio.
Merge remote branch 'github/master'
make the style smallBox in Forms a bit simpler