Merge master to production

Just playing with the merge request for master -> production.

If we put the production branch to the currently deployed commit [1], it would actually show the changes between currently deployed and now.

[1] although the sha will not match up due to the history rewrite