Don't fail anymore when there is no mq.web.templates / mq.web.static configuration
Merge remote-tracking branch 'origin/develop' into develop