Fix borked licence references
Merge branch 'feature-mexico-questionniare' into staging