Fix another indentation error
Automatically locate ImageMagick and Ghostscript.
Merge remote branch 'upstream/master'