improved redirects
added image_upload_dir to sample conf
more diagnostics
Merge remote-tracking branch 'upstream/master'