Saw this recently - seems there will actually be more than 21 million - however not that we'll see any more than 21m this lifetime! More due in around 2200 https://github.com/bitcoin/bips/raw/master/bip-0042/inflation.png
https://github.com/bitcoin/bips/blob/master/bip-0042.mediawiki