Merge pull request #989 from oliverds/master

A couple of enhancements
#996 (Minify CSS/JS remove from general settings)
Merge remote-tracking branch 'upstream/master'