Update your fork to the main master branch

Since Benjol has accepted a few minor changes to the master branch. This pull request is for you to merge those back into your fork. It's the same as the other way around but I am opening it with you as the target and him as the source. You should be able to just hit a green button and let Github take care of the merge for you.

After you merge, your master should be functionally equivalent with the released branch again. Next you should REBASE your feature branches on this.

    # Sync up your local master branch to get the merge data you did on Github.
    git checkout master
    git pull

    # Change to your feature branch
    git checkout site_specific_features

    # Rebase that branch on your new master that has up do date stuff from upstream
    git rebase master

    # Push those changes up to your feature branch
    git push -f

Note the last operation is forced because `git rebase` rewrites history as if you had branched off of a clean current master branch and re-applies each of your commits. You could also do a merge instead that would write the changes that have happened in master over the top or your feature branch, but that generates a little extra clutter when your feature branch gets merged.