Merge addition of Base64Variant.decode() from 2.2.3