Add check to catch a warning
Merge Branch 'stable' to 'master'

Now we just have to go back through 'unstable'
and try to cherry pick unbroken stuff...