Merge branch 'master' of git://sh.seatribe.se/salem-client
Merge remote-tracking branch 'upstream/master'
Improved field rendering when not using 1x1 fix