Add compiler flag -O2 back to unrar, ref #847
Merge remote-tracking branch 'upstream/develop' into develop