Warning for people who update master
Merge branch 'master' into refactor
Revert "Warning for people who update master"

This reverts commit 75d595099f3c6e155a5c029ac88dedd177473d28.