Merge "Whoops, this version number wasn't updated when JB was introduced!" into jb-dev