Merge pre-1.9 fixes

Too many merge conflicts to make a proper merge worthwhile. See the "pre-1-9-changes" branch to get a full history of changes.
Reduce folder/download size by optimizing images