For master we retain the more strict check in case we forget to bump
the API version as discussed on irc.  Implementation idea from scoof.

Fixes #1538