Make sure it's still working with the latest
Merge remote-tracking branch 'origin/master'