Update MST branch with changes to master

[nickjcroucher]

Because I forgot to approve the rapidnj PR.

[johnlees]

There's no problem with this, but you don't strictly need to make a PR to merge from master - only needed for merges into master. You can just do:

git checkout master
git pull
git checkout mst
git merge master
git push