Custom name/mod: diy997; End procedures of iconset creation immediately for non-channel pages
Merge remote-tracking branch 'origin/master' into gh-pages