Improved pagespeed support
Fixes in mpm templates