update to latest upstream
Merge branch 'master' of github.com:ligthyear/discourse_patches